Index: applications/ecommerce/webapp/ecommerce/order/CheckoutProcess.ftl =================================================================== --- applications/ecommerce/webapp/ecommerce/order/CheckoutProcess.ftl (revision 0) +++ applications/ecommerce/webapp/ecommerce/order/CheckoutProcess.ftl (revision 0) @@ -0,0 +1,791 @@ +<#----> +
+
+
STEP1: Checkout
+
+ <#if shoppingCart?has_content && shoppingCart.size() gt 0> +
+
+ + + + + + + + + + + + + + + <#list shoppingCart.items() as cartLine> + <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)> + <#assign lineOptionalFeatures = cartLine.getOptionalProductFeatures()> + + + + + + + <#if cartLine.getIsPromo()> + + <#else> + + + + + + + + <#if shoppingCart?has_content> + + + + + + + <#----> + + + + + <#----> + + + + + <#----> + + + + + <#----> + + + +
ItemDescriptionQtyPriceEditRemove
+ <#if cartLine.getProductId()?exists> + <#if cartLine.getParentProductId()?exists> + <#assign parentProductId = cartLine.getParentProductId()/> + <#else> + <#assign parentProductId = cartLine.getProductId()/> + + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists> + <#if !smallImageUrl?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"> + <#if smallImageUrl?has_content> + + + + + + + ${cartLine.getProductId()} - + ${cartLine.getName()?if_exists} : ${cartLine.getDescription()?if_exists} + + + FREE<@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency()/>
Subtotal
 +
<@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency()/>
+
Discount
 +
+ <#if shoppingCart.getAdjustments()?has_content> + <#list shoppingCart.getAdjustments() as cartAdjustment> + <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=shoppingCart.getCurrency()/> + + <#else>$0.00 + +
+
Shipping
 +
+ <#if (shoppingCart.getTotalShipping() > 0.0)> + <@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency()/> + <#else>$0.00 + +
+
Tax
 +
+ <#if (shoppingCart.getTotalSalesTax() > 0.0)> + <@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/> + <#else>$0.00 + +
+
Total
 +
+ <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/> +
+
+
+
+ <#else> +

You current have no items in your cart. Click here to view our products!.

+ +
+
+
+
STEP2: Shipping + +
+
+
+
+ + + + + + + + +
<#--style="display:none"--> + + + + +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ + - + + + - + + + + + + ext + +
+
+
+
+ +
+
+ +
+
+
+
+ + + Continue to Step 3 + + +
+
+
+
+
+
+
STEP3: Billing + +
+
+
+
+ + + + + + + + + + + + + + + + + + + <#----> + +
<#-- style="display:none">--> + + + + + + + +
+
+
+
+ +
+
+ +
+
+ <#--credit card info....--> + + <#--eft Account info.....--> + +
+
+
+
+ checked "> +
+
+ +
+
+ +
+
+
+
+
+ checked "/> +
+
+ +
+
+ +
+
+ + + Confirm Purchase + + +
+
+
+
+
+
+
${uiLabelMap.CommonComments}
+
+
+
+ +
+
+
\ No newline at end of file Index: applications/ecommerce/webapp/ecommerce/login.ftl =================================================================== --- applications/ecommerce/webapp/ecommerce/login.ftl (revision 609890) +++ applications/ecommerce/webapp/ecommerce/login.ftl (working copy) @@ -94,6 +94,9 @@
+
+
+
Index: applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/quickAnonBillAndPaymentInfo.bsh =================================================================== --- applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/quickAnonBillAndPaymentInfo.bsh (revision 0) +++ applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/quickAnonBillAndPaymentInfo.bsh (revision 0) @@ -0,0 +1,102 @@ + +import org.ofbiz.base.util.*; +import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.entity.*; +import org.ofbiz.entity.util.*; +import org.ofbiz.order.shoppingcart.*; +import org.ofbiz.party.contact.*; +import org.ofbiz.product.catalog.*; + + +partyId = null; + +userLogin = context.get("userLogin"); + +if (userLogin != null) { + partyId = userLogin.get("partyId"); + parameters.put("partyId",partyId); + parameters.put("userLogin",userLogin); +} else { + userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "anonymous")); + session.setAttribute("userLogin",userLogin); +} + +if (partyId == null && parameters.get("partyId") != null) { + partyId = parameters.get("partyId"); +} + +shippingContactMechId = ""; +//get billing information here because we can't get billingContactMechId in request,session or parameters in /order/quickAnonCustSettings.bsh file +billToContactMechDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", + UtilMisc.toMap("partyId", partyId, "contactMechPurposeTypeId", "BILLING_LOCATION")), true)); +billToContactMechId = ""; +if (billToContactMechDetail != null){ + billToContactMechId = billToContactMechDetail.get("contactMechId"); + if(billToContactMechId != null){ + billPostalAddress = delegator.findByPrimaryKey("PostalAddress",UtilMisc.toMap("contactMechId",billToContactMechId)); + parameters.put("billToContactMechId", billPostalAddress.get("contactMechId")); + parameters.put("billToAttnName", billPostalAddress.get("attnName")); + parameters.put("billToAddress1", billPostalAddress.get("address1")); + parameters.put("billToAddress2", billPostalAddress.get("address2")); + parameters.put("billToCity", billPostalAddress.get("city")); + parameters.put("billToPostalCode", billPostalAddress.get("postalCode")); + parameters.put("billToStateProvinceGeoId", billPostalAddress.get("stateProvinceGeoId")); + parameters.put("billToCountryGeoId", billPostalAddress.get("countryGeoId")); + billMap = delegator.findByPrimaryKey("ContactMech", UtilMisc.toMap("contactMechId", billToContactMechId)); + //we can get credit card,eft account information using "paymentinformation.bsh" but this file is used for registered checkout + creditCardMaps = billMap.getRelated("CreditCard"); + if(creditCardMaps != null){ + creditCardIter = creditCardMaps.iterator(); + while (creditCardIter.hasNext()){ + creditCardDetail = creditCardIter.next(); + if(creditCardDetail != null){ + parameters.put("paymentMethodId", creditCardDetail.get("paymentMethodId")); + parameters.put("cardType", creditCardDetail.get("cardType")); + parameters.put("cardNumber", creditCardDetail.get("cardNumber")); + parameters.put("companyNameOnCard", creditCardDetail.get("companyNameOnCard")); + parameters.put("titleOnCard", creditCardDetail.get("titleOnCard")); + parameters.put("suffixOnCard", creditCardDetail.get("suffixOnCard")); + //parameters.put("description", creditCardDetail.get("description")); + expireDate = creditCardDetail.get("expireDate"); + parameters.put("expireDate",expireDate); +// if(UtilValidate.isNotEmpty(expireDate)){ +// expMonth = expireDate.substring(0,2); +// expYear = expireDate.substring(3,7); +// parameters.put("expMonth", expMonth); +// parameters.put("expYear", expYear); +// } + parameters.put("firstNameOnCard", creditCardDetail.get("firstNameOnCard")); + parameters.put("middleNameOnCard", creditCardDetail.get("middleNameOnCard")); + parameters.put("lastNameOnCard", creditCardDetail.get("lastNameOnCard")); + } + } + } + + eftAccountMaps = billMap.getRelated("EftAccount"); + if(eftAccountMaps != null){ + eftAccountIter = eftAccountMaps.iterator(); + while(eftAccountIter.hasNext()){ + eftAccountDetail = eftAccountIter.next(); + if(eftAccountDetail != null){ + parameters.put("paymentMethodId", eftAccountDetail.get("paymentMethodId")); + parameters.put("nameOnAccount", eftAccountDetail.get("nameOnAccount")); + parameters.put("companyNameOnAccount", eftAccountDetail.get("companyNameOnAccount")); + parameters.put("bankName", eftAccountDetail.get("bankName")); + parameters.put("routingNumber", eftAccountDetail.get("routingNumber")); + parameters.put("accountType", eftAccountDetail.get("accountType")); + parameters.put("accountNumber", eftAccountDetail.get("accountNumber")); + //parameters.put("description", eftAccountDetail.get("description")); + } + } + } + } +} + + +if (partyId != null){ + if(shippingContactMechId != null){ + if(billToContactMechId != "" && billToContactMechId.equals(shippingContactMechId)){ + parameters.put("sameAsShipping","Y"); + } + } +} \ No newline at end of file Index: applications/ecommerce/script/org/ofbiz/ecommerce/customer/processComments.bsh =================================================================== --- applications/ecommerce/script/org/ofbiz/ecommerce/customer/processComments.bsh (revision 0) +++ applications/ecommerce/script/org/ofbiz/ecommerce/customer/processComments.bsh (revision 0) @@ -0,0 +1,15 @@ +import org.ofbiz.order.shoppingcart.ShoppingCartEvents; + +cart = ShoppingCartEvents.getCartObject(request); +session = request.getSession(); + +comments = request.getParameter("comments"); +if(comments == null){ + cart.getOrderNotes().clear(); + } +if(comments != null){ + cart.getOrderNotes().clear(); + cart.addOrderNote(comments); +} + +return "success"; \ No newline at end of file Index: applications/ecommerce/widget/OrderScreens.xml =================================================================== --- applications/ecommerce/widget/OrderScreens.xml (revision 609890) +++ applications/ecommerce/widget/OrderScreens.xml (working copy) @@ -606,5 +606,42 @@ + +
+ +